Autogenerated HTML docs for v2.47.0-72-gef8ce8
diff --git a/git-commit.html b/git-commit.html index f0a42ad..47d1a92 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -555,51 +555,51 @@ </dd> <dt class="hdlist1">--fixup=[(amend|reword):]<commit></dt> <dd> -<p>Create a new commit which "fixes up" <code><commit></code> when applied with -<code>git rebase --autosquash</code>. Plain <code>--fixup=<commit></code> creates a -"fixup!" commit which changes the content of <code><commit></code> but leaves -its log message untouched. <code>--fixup=amend:<commit></code> is similar but +<p>Create a new commit which "fixes up" <em><commit></em> when applied with +<code>git</code> <code>rebase</code> <code>--autosquash</code>. Plain <code>--fixup=</code><em><commit></em> creates a +"fixup!" commit which changes the content of <em><commit></em> but leaves +its log message untouched. <code>--fixup=amend:</code><em><commit></em> is similar but creates an "amend!" commit which also replaces the log message of -<code><commit></code> with the log message of the "amend!" commit. -<code>--fixup=reword:<commit></code> creates an "amend!" commit which -replaces the log message of <code><commit></code> with its own log message -but makes no changes to the content of <code><commit></code>.</p> +<em><commit></em> with the log message of the "amend!" commit. +<code>--fixup=reword:</code><em><commit></em> creates an "amend!" commit which +replaces the log message of <em><commit></em> with its own log message +but makes no changes to the content of <em><commit></em>.</p> <div class="paragraph"> -<p>The commit created by plain <code>--fixup=<commit></code> has a subject +<p>The commit created by plain <code>--fixup=</code><em><commit></em> has a subject composed of "fixup!" followed by the subject line from <commit>, -and is recognized specially by <code>git rebase --autosquash</code>. The <code>-m</code> +and is recognized specially by <code>git</code> <code>rebase</code> <code>--autosquash</code>. The <code>-m</code> option may be used to supplement the log message of the created commit, but the additional commentary will be thrown away once the -"fixup!" commit is squashed into <code><commit></code> by -<code>git rebase --autosquash</code>.</p> +"fixup!" commit is squashed into <em><commit></em> by +<code>git</code> <code>rebase</code> <code>--autosquash</code>.</p> </div> <div class="paragraph"> -<p>The commit created by <code>--fixup=amend:<commit></code> is similar but its +<p>The commit created by <code>--fixup=amend:</code><em><commit></em> is similar but its subject is instead prefixed with "amend!". The log message of <commit> is copied into the log message of the "amend!" commit and -opened in an editor so it can be refined. When <code>git rebase ---autosquash</code> squashes the "amend!" commit into <code><commit></code>, the -log message of <code><commit></code> is replaced by the refined log message +opened in an editor so it can be refined. When <code>git</code> <code>rebase</code> +<code>--autosquash</code> squashes the "amend!" commit into <em><commit></em>, the +log message of <em><commit></em> is replaced by the refined log message from the "amend!" commit. It is an error for the "amend!" commit’s log message to be empty unless <code>--allow-empty-message</code> is specified.</p> </div> <div class="paragraph"> -<p><code>--fixup=reword:<commit></code> is shorthand for <code>--fixup=amend:<commit> ---only</code>. It creates an "amend!" commit with only a log message -(ignoring any changes staged in the index). When squashed by <code>git -rebase --autosquash</code>, it replaces the log message of <code><commit></code> +<p><code>--fixup=reword:</code><em><commit></em> is shorthand for <code>--fixup=amend:</code><em><commit></em> +<code>--only</code>. It creates an "amend!" commit with only a log message +(ignoring any changes staged in the index). When squashed by <code>git</code> +<code>rebase</code> <code>--autosquash</code>, it replaces the log message of <em><commit></em> without making any other changes.</p> </div> <div class="paragraph"> <p>Neither "fixup!" nor "amend!" commits change authorship of -<code><commit></code> when applied by <code>git rebase --autosquash</code>. +<em><commit></em> when applied by <code>git</code> <code>rebase</code> <code>--autosquash</code>. See <a href="git-rebase.html">git-rebase(1)</a> for details.</p> </div> </dd> <dt class="hdlist1">--squash=<commit></dt> <dd> -<p>Construct a commit message for use with <code>rebase --autosquash</code>. +<p>Construct a commit message for use with <code>rebase</code> <code>--autosquash</code>. The commit message subject line is taken from the specified commit with a prefix of "squash! ". Can be used with additional commit message options (<code>-m</code>/<code>-c</code>/<code>-C</code>/<code>-F</code>). See @@ -651,7 +651,7 @@ <dt class="hdlist1">--author=<author></dt> <dd> <p>Override the commit author. Specify an explicit author using the -standard <code>A U Thor <author@example.com></code> format. Otherwise <author> +standard <code>A</code> <code>U</code> <code>Thor</code> <author@example.<code>com</code>> format. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author (i.e. rev-list --all -i --author=<author>); the commit author is then copied from the first such commit found.</p> @@ -704,11 +704,11 @@ <dt class="hdlist1">--trailer <token>[(=|:)<value>]</dt> <dd> <p>Specify a (<token>, <value>) pair that should be applied as a -trailer. (e.g. <code>git commit --trailer "Signed-off-by:C O Mitter \ -<committer@example.com>" --trailer "Helped-by:C O Mitter \ -<committer@example.com>"</code> will add the "Signed-off-by" trailer +trailer. (e.g. <code>git</code> <code>commit</code> <code>--trailer</code> "Signed-off-by:C <code>O</code> <code>Mitter</code> \ +<committer@example.<code>com</code>>" <code>--trailer</code> "Helped-by:C <code>O</code> <code>Mitter</code> \ +<committer@example.<code>com</code>>" will add the "Signed-off-by" trailer and the "Helped-by" trailer to the commit message.) -The <code>trailer.*</code> configuration variables +The <code>trailer.</code>* configuration variables (<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>) can be used to define if a duplicated trailer is omitted, where in the run of trailers each trailer would appear, and other details.</p> @@ -760,7 +760,7 @@ <dd> <p>Same as <code>whitespace</code> except that everything from (and including) the line found below is truncated, if the message is to be edited. -"<code>#</code>" can be customized with core.commentChar.</p> +"#" can be customized with core.commentChar.</p> <div class="literalblock"> <div class="content"> <pre># ------------------------ >8 ------------------------</pre> @@ -792,7 +792,7 @@ <dt class="hdlist1">--no-edit</dt> <dd> <p>Use the selected commit message without launching an editor. -For example, <code>git commit --amend --no-edit</code> amends a commit +For example, <code>git</code> <code>commit</code> <code>--amend</code> <code>--no-edit</code> amends a commit without changing its commit message.</p> </dd> <dt class="hdlist1">--amend</dt> @@ -858,8 +858,8 @@ </dd> <dt class="hdlist1">--pathspec-from-file=<file></dt> <dd> -<p>Pathspec is passed in <code><file></code> instead of commandline args. If -<code><file></code> is exactly <code>-</code> then standard input is used. Pathspec +<p>Pathspec is passed in <em><file></em> instead of commandline args. If +<em><file></em> is exactly <code>-</code> then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable <code>core.quotePath</code> (see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and @@ -984,11 +984,11 @@ your working tree are temporarily stored to a staging area called the "index" with <em>git add</em>. A file can be reverted back, only in the index but not in the working tree, -to that of the last commit with <code>git restore --staged <file></code>, +to that of the last commit with <code>git</code> <code>restore</code> <code>--staged</code> <em><file></em>, which effectively reverts <em>git add</em> and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, -<code>git commit</code> (without any pathname parameter) is used to record what +<code>git</code> <code>commit</code> (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:</p> </div> @@ -1002,9 +1002,9 @@ </div> <div class="paragraph"> <p>Instead of staging files after each individual change, you can -tell <code>git commit</code> to notice the changes to the files whose +tell <code>git</code> <code>commit</code> to notice the changes to the files whose contents are tracked in -your working tree and do corresponding <code>git add</code> and <code>git rm</code> +your working tree and do corresponding <code>git</code> <code>add</code> and <code>git</code> <code>rm</code> for you. That is, this example does the same as the earlier example if there is no other change in your working tree:</p> </div> @@ -1016,13 +1016,13 @@ </div> </div> <div class="paragraph"> -<p>The command <code>git commit -a</code> first looks at your working tree, +<p>The command <code>git</code> <code>commit</code> <code>-a</code> first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, -and performs necessary <code>git add</code> and <code>git rm</code> for you.</p> +and performs necessary <code>git</code> <code>add</code> and <code>git</code> <code>rm</code> for you.</p> </div> <div class="paragraph"> <p>After staging changes to many files, you can alter the order the -changes are recorded in, by giving pathnames to <code>git commit</code>. +changes are recorded in, by giving pathnames to <code>git</code> <code>commit</code>. When pathnames are given, the command makes a commit that only records the changes made to the named paths:</p> </div> @@ -1067,9 +1067,9 @@ </div> </div> <div class="paragraph"> -<p>After resolving conflicts and staging the result, <code>git ls-files -u</code> +<p>After resolving conflicts and staging the result, <code>git</code> <code>ls-files</code> <code>-u</code> would stop mentioning the conflicted path. When you are done, -run <code>git commit</code> to finally record the merge:</p> +run <code>git</code> <code>commit</code> to finally record the merge:</p> </div> <div class="listingblock"> <div class="content"> @@ -1079,7 +1079,7 @@ <div class="paragraph"> <p>As with the case to record your own changes, you can use <code>-a</code> option to save typing. One difference is that during a merge -resolution, you cannot use <code>git commit</code> with pathnames to +resolution, you cannot use <code>git</code> <code>commit</code> with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see <code>-i</code> option).</p> @@ -1143,15 +1143,15 @@ <dl> <dt class="hdlist1">Git internal format</dt> <dd> -<p>It is <code><unix-timestamp> <time-zone-offset></code>, where -<code><unix-timestamp></code> is the number of seconds since the UNIX epoch. -<code><time-zone-offset></code> is a positive or negative offset from UTC. +<p>It is <em><unix-timestamp></em> <em><time-zone-offset></em>, where +<em><unix-timestamp></em> is the number of seconds since the UNIX epoch. +<em><time-zone-offset></em> is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is <code>+0100</code>.</p> </dd> <dt class="hdlist1">RFC 2822</dt> <dd> <p>The standard date format as described by RFC 2822, for example -<code>Thu, 07 Apr 2005 22:13:13 +0200</code>.</p> +<code>Thu,</code> <code>07</code> <code>Apr</code> <code>2005</code> <code>22:13:13</code> <code>+0200</code>.</p> </dd> <dt class="hdlist1">ISO 8601</dt> <dd> @@ -1209,7 +1209,7 @@ <p>Path names are encoded in UTF-8 normalization form C. This applies to tree objects, the index file, ref names, as well as path names in command line arguments, environment variables -and config files (<code>.git/config</code> (see <a href="git-config.html">git-config(1)</a>), +and config files (.<code>git/config</code> (see <a href="git-config.html">git-config(1)</a>), <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and <a href="gitmodules.html">gitmodules(5)</a>).</p> <div class="paragraph"> @@ -1248,7 +1248,7 @@ a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to -have <code>i18n.commitEncoding</code> in <code>.git/config</code> file, like this:</p> +have <code>i18n.commitEncoding</code> in .<code>git/config</code> file, like this:</p> <div class="listingblock"> <div class="content"> <pre>[i18n] @@ -1267,7 +1267,7 @@ <code>encoding</code> header of a commit object, and try to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with -<code>i18n.logOutputEncoding</code> in <code>.git/config</code> file, like this:</p> +<code>i18n.logOutputEncoding</code> in .<code>git/config</code> file, like this:</p> <div class="listingblock"> <div class="content"> <pre>[i18n] @@ -1308,11 +1308,11 @@ <dt class="hdlist1">commit.cleanup</dt> <dd> <p>This setting overrides the default of the <code>--cleanup</code> option in -<code>git commit</code>. See <a href="git-commit.html">git-commit(1)</a> for details. Changing the +<code>git</code> <code>commit</code>. See <a href="git-commit.html">git-commit(1)</a> for details. Changing the default can be useful when you always want to keep lines that begin -with the comment character <code>#</code> in your log message, in which case you -would do <code>git config commit.cleanup whitespace</code> (note that you will -have to remove the help lines that begin with <code>#</code> in the commit log +with the comment character # in your log message, in which case you +would do <code>git</code> <code>config</code> <code>commit.cleanup</code> <code>whitespace</code> (note that you will +have to remove the help lines that begin with # in the commit log template yourself, if you do this).</p> </dd> <dt class="hdlist1">commit.gpgSign</dt> @@ -1336,7 +1336,7 @@ </dd> <dt class="hdlist1">commit.verbose</dt> <dd> -<p>A boolean or int to specify the level of verbosity with <code>git commit</code>. +<p>A boolean or int to specify the level of verbosity with <code>git</code> <code>commit</code>. See <a href="git-commit.html">git-commit(1)</a>.</p> </dd> </dl> @@ -1361,10 +1361,10 @@ <dt class="hdlist1"><code>$GIT_DIR/COMMIT_EDITMSG</code></dt> <dd> <p>This file contains the commit message of a commit in progress. -If <code>git commit</code> exits due to an error before creating a commit, +If <code>git</code> <code>commit</code> exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be -overwritten by the next invocation of <code>git commit</code>.</p> +overwritten by the next invocation of <code>git</code> <code>commit</code>.</p> </dd> </dl> </div>
